merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 30 Mar 2011 07:10:47 +0000 (16:10 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 30 Mar 2011 07:10:47 +0000 (16:10 +0900)

Trivial merge